Merge git://git.denx.de/u-boot-fdt
authorTom Rini <[email protected]>
Wed, 16 Sep 2015 13:53:37 +0000 (09:53 -0400)
committerTom Rini <[email protected]>
Wed, 16 Sep 2015 13:53:37 +0000 (09:53 -0400)

Trivial merge